Use conjure-python-client

.circleci/config.yml

@@ -63,14 +63,14 @@ jobs:
           command: pip install --user setuptools tox==2.9.1 tox-virtualenv-no-download
 
       - restore_cache:
-          key: tox-v2-py27-{{ checksum "tox.ini" }}
+          key: tox-v2-py27-{{ checksum "tox.ini" }}-{{ checksum "setup.py" }}
 
       - run:
           name: Install tox things
           command: if [ ! -d ".tox" ]; then python -m tox -e py27 --notest; fi
 
       - save_cache:
-          key: tox-v2-py27-{{ checksum "tox.ini" }}
+          key: tox-v2-py27-{{ checksum "tox.ini" }}-{{ checksum "setup.py"}}
           paths:
             - .tox
 
@@ -99,14 +99,14 @@ jobs:
           command: pip install --user setuptools tox==2.9.1 tox-virtualenv-no-download
 
       - restore_cache:
-          key: tox-v2-py3-{{ checksum "tox.ini" }}
+          key: tox-v2-py3-{{ checksum "tox.ini" }}-{{ checksum "setup.py" }}
 
       - run:
           name: Install tox things
           command: if [ ! -d ".tox" ]; then python -m tox -e py3 --notest; fi
 
       - save_cache:
-          key: tox-v2-py3-{{ checksum "tox.ini" }}
+          key: tox-v2-py3-{{ checksum "tox.ini" }}-{{ checksum "setup.py" }}
           paths:
             - .tox
 

conjure-python-core/src/main/java/com/palantir/conjure/python/ConjurePythonGenerator.java

@@ -145,7 +145,7 @@ private PythonFile buildPythonSetupFile() {
                 .putOptions("name", config.packageName())
                 .putOptions("version", config.packageVersion())
                 .addInstallDependencies("requests", "typing")
-                .addInstallDependencies(String.format("conjure-client>=%s,<%s",
+                .addInstallDependencies(String.format("conjure-python-client>=%s,<%s",
                         config.minConjureClientVersion(), config.maxConjureClientVersion()));
         config.packageDescription().ifPresent(value -> builder.putOptions("description", value));
         config.packageUrl().ifPresent(value -> builder.putOptions("url", value));
@@ -163,7 +163,7 @@ private PythonFile buildCondaMetaYamlFile() {
                 .condaPackageName(config.packageName())
                 .packageVersion(config.packageVersion())
                 .addInstallDependencies("requests", "typing")
-                .addInstallDependencies(String.format("conjure-client >=%s,<%s",
+                .addInstallDependencies(String.format("conjure--python-client >=%s,<%s",
                         config.minConjureClientVersion(), config.maxConjureClientVersion()))
                 .build();
 

conjure-python-core/src/main/java/com/palantir/conjure/python/poet/PythonBean.java

@@ -29,8 +29,8 @@
 public interface PythonBean extends PythonClass {
 
     ImmutableSet<PythonImport> DEFAULT_IMPORTS = ImmutableSet.of(
-            PythonImport.of(PythonClassName.of("conjure", "ConjureBeanType")),
-            PythonImport.of(PythonClassName.of("conjure", "ConjureFieldDefinition")));
+            PythonImport.of(PythonClassName.of("conjure_python_client", "ConjureBeanType")),
+            PythonImport.of(PythonClassName.of("conjure_python_client", "ConjureFieldDefinition")));
 
     @Override
     @Value.Default

conjure-python-core/src/main/java/com/palantir/conjure/python/poet/PythonEnum.java

@@ -28,7 +28,7 @@
 public interface PythonEnum extends PythonClass {
 
     ImmutableSet<PythonImport> DEFAULT_IMPORTS = ImmutableSet.of(
-            PythonImport.of(PythonClassName.of("conjure", "ConjureEnumType")));
+            PythonImport.of(PythonClassName.of("conjure_python_client", "ConjureEnumType")));
 
     @Override
     @Value.Default

conjure-python-core/src/main/java/com/palantir/conjure/python/poet/PythonService.java

@@ -25,9 +25,9 @@
 public interface PythonService extends PythonClass {
 
     ImmutableSet<PythonImport> DEFAULT_IMPORTS = ImmutableSet.of(
-            PythonImport.of(PythonClassName.of("conjure", "ConjureEncoder")),
-            PythonImport.of(PythonClassName.of("conjure", "ConjureDecoder")),
-            PythonImport.of(PythonClassName.of("httpremoting", "Service")));
+            PythonImport.of(PythonClassName.of("conjure_python_client", "ConjureEncoder")),
+            PythonImport.of(PythonClassName.of("conjure_python_client", "ConjureDecoder")),
+            PythonImport.of(PythonClassName.of("conjure_python_client", "Service")));
 
     @Override
     @Value.Default

conjure-python-core/src/main/java/com/palantir/conjure/python/poet/PythonUnionTypeDefinition.java

@@ -28,8 +28,8 @@
 public interface PythonUnionTypeDefinition extends PythonClass {
 
     ImmutableSet<PythonImport> DEFAULT_IMPORTS = ImmutableSet.of(
-            PythonImport.of(PythonClassName.of("conjure", "ConjureUnionType")),
-            PythonImport.of(PythonClassName.of("conjure", "ConjureFieldDefinition")));
+            PythonImport.of(PythonClassName.of("conjure_python_client", "ConjureUnionType")),
+            PythonImport.of(PythonClassName.of("conjure_python_client", "ConjureFieldDefinition")));
 
     @Override
     @Value.Default

conjure-python-core/src/main/java/com/palantir/conjure/python/util/ImportsVisitor.java

@@ -41,7 +41,7 @@ public Set<PythonImport> visitPrimitive(PrimitiveType value) {
         if (value.equals(PrimitiveType.ANY)) {
             return ImmutableSet.of(PythonImport.of(PythonClassName.of("typing", "Any")));
         } else if (value.equals(PrimitiveType.BINARY)) {
-            return ImmutableSet.of(PythonImport.of(PythonClassName.of("conjure", "BinaryType")));
+            return ImmutableSet.of(PythonImport.of(PythonClassName.of("conjure_python_client", "BinaryType")));
         }
         return Collections.emptySet();
     }
@@ -51,7 +51,7 @@ public Set<PythonImport> visitOptional(OptionalType value) {
         ImmutableSet.Builder<PythonImport> setBuilder = ImmutableSet.builder();
         return setBuilder
                 .add(PythonImport.of(PythonClassName.of("typing", "Optional")))
-                .add(PythonImport.of(PythonClassName.of("conjure", "OptionalType")))
+                .add(PythonImport.of(PythonClassName.of("conjure_python_client", "OptionalType")))
                 .addAll(value.getItemType().accept(this))
                 .build();
     }
@@ -61,7 +61,7 @@ public Set<PythonImport> visitList(ListType value) {
         ImmutableSet.Builder<PythonImport> setBuilder = ImmutableSet.builder();
         return setBuilder
                 .add(PythonImport.of(PythonClassName.of("typing", "List")))
-                .add(PythonImport.of(PythonClassName.of("conjure", "ListType")))
+                .add(PythonImport.of(PythonClassName.of("conjure_python_client", "ListType")))
                 .addAll(value.getItemType().accept(this))
                 .build();
     }
@@ -71,7 +71,7 @@ public Set<PythonImport> visitSet(SetType value) {
         ImmutableSet.Builder<PythonImport> setBuilder = ImmutableSet.builder();
         return setBuilder
                 .add(PythonImport.of(PythonClassName.of("typing", "Set")))
-                .add(PythonImport.of(PythonClassName.of("conjure", "ListType")))
+                .add(PythonImport.of(PythonClassName.of("conjure_python_client", "ListType")))
                 .addAll(value.getItemType().accept(this))
                 .build();
     }
@@ -81,7 +81,7 @@ public Set<PythonImport> visitMap(MapType value) {
         ImmutableSet.Builder<PythonImport> setBuilder = ImmutableSet.builder();
         return setBuilder
                 .add(PythonImport.of(PythonClassName.of("typing", "Dict")))
-                .add(PythonImport.of(PythonClassName.of("conjure", "DictType")))
+                .add(PythonImport.of(PythonClassName.of("conjure_python_client", "DictType")))
                 .addAll(value.getKeyType().accept(this))
                 .addAll(value.getValueType().accept(this))
                 .build();

conjure-python-core/src/test/java/com/palantir/conjure/python/ConjurePythonGeneratorTest.java

@@ -43,7 +43,7 @@ public final class ConjurePythonGeneratorTest {
                     .packageName("package")
                     .packageVersion("0.0.0")
                     .packageDescription("project description")
-                    .minConjureClientVersion("0.0.0")
+                    .minConjureClientVersion("1.0.0")
                     .shouldWriteCondaRecipe(true)
                     .build());
     private final InMemoryPythonFileWriter pythonFileWriter = new InMemoryPythonFileWriter();

conjure-python-core/src/test/resources/services/expected/conda_recipe/meta.yaml

@@ -16,10 +16,10 @@ requirements:
         - setuptools
         - requests
         - typing
-        - conjure-client >=0.0.0,<1
+        - conjure--python-client >=1.0.0,<2
 
     run:
         - python
         - requests
         - typing
-        - conjure-client >=0.0.0,<1
+        - conjure--python-client >=1.0.0,<2

conjure-python-core/src/test/resources/services/expected/package/another/TestService.py

@@ -1,13 +1,13 @@
 from ..product.CreateDatasetRequest import CreateDatasetRequest
 from ..product_datasets.BackingFileSystem import BackingFileSystem
 from ..product_datasets.Dataset import Dataset
-from conjure import BinaryType
-from conjure import ConjureDecoder
-from conjure import ConjureEncoder
-from conjure import DictType
-from conjure import ListType
-from conjure import OptionalType
-from httpremoting import Service
+from conjure_python_client import BinaryType
+from conjure_python_client import ConjureDecoder
+from conjure_python_client import ConjureEncoder
+from conjure_python_client import DictType
+from conjure_python_client import ListType
+from conjure_python_client import OptionalType
+from conjure_python_client import Service
 from typing import Dict
 from typing import Optional
 from typing import Set

conjure-python-core/src/test/resources/services/expected/package/product/CreateDatasetRequest.py

@@ -1,5 +1,5 @@
-from conjure import ConjureBeanType
-from conjure import ConjureFieldDefinition
+from conjure_python_client import ConjureBeanType
+from conjure_python_client import ConjureFieldDefinition
 
 class CreateDatasetRequest(ConjureBeanType):
 

conjure-python-core/src/test/resources/services/expected/package/product_datasets/BackingFileSystem.py

@@ -1,6 +1,6 @@
-from conjure import ConjureBeanType
-from conjure import ConjureFieldDefinition
-from conjure import DictType
+from conjure_python_client import ConjureBeanType
+from conjure_python_client import ConjureFieldDefinition
+from conjure_python_client import DictType
 from typing import Dict
 
 class BackingFileSystem(ConjureBeanType):

conjure-python-core/src/test/resources/services/expected/package/product_datasets/Dataset.py

@@ -1,5 +1,5 @@
-from conjure import ConjureBeanType
-from conjure import ConjureFieldDefinition
+from conjure_python_client import ConjureBeanType
+from conjure_python_client import ConjureFieldDefinition
 
 class Dataset(ConjureBeanType):
 

conjure-python-core/src/test/resources/services/expected/setup.py

@@ -9,6 +9,6 @@
     install_requires=[
         'requests',
         'typing',
-        'conjure-client>=0.0.0,<1',
+        'conjure-python-client>=1.0.0,<2',
     ],
 )

conjure-python-core/src/test/resources/types/expected/conda_recipe/meta.yaml

@@ -16,10 +16,10 @@ requirements:
         - setuptools
         - requests
         - typing
-        - conjure-client >=0.0.0,<1
+        - conjure--python-client >=1.0.0,<2
 
     run:
         - python
         - requests
         - typing
-        - conjure-client >=0.0.0,<1
+        - conjure--python-client >=1.0.0,<2

conjure-python-core/src/test/resources/types/expected/package/another/TestService.py

@@ -1,13 +1,13 @@
 from ..product.CreateDatasetRequest import CreateDatasetRequest
 from ..product_datasets.BackingFileSystem import BackingFileSystem
 from ..product_datasets.Dataset import Dataset
-from conjure import BinaryType
-from conjure import ConjureDecoder
-from conjure import ConjureEncoder
-from conjure import DictType
-from conjure import ListType
-from conjure import OptionalType
-from httpremoting import Service
+from conjure_python_client import BinaryType
+from conjure_python_client import ConjureDecoder
+from conjure_python_client import ConjureEncoder
+from conjure_python_client import DictType
+from conjure_python_client import ListType
+from conjure_python_client import OptionalType
+from conjure_python_client import Service
 from typing import Dict
 from typing import Optional
 from typing import Set

conjure-python-core/src/test/resources/types/expected/package/nested_deeply_nested_service/DeeplyNestedService.py

@@ -1,6 +1,6 @@
-from conjure import ConjureDecoder
-from conjure import ConjureEncoder
-from httpremoting import Service
+from conjure_python_client import ConjureDecoder
+from conjure_python_client import ConjureEncoder
+from conjure_python_client import Service
 
 class DeeplyNestedService(Service):
 

conjure-python-core/src/test/resources/types/expected/package/nested_service/SimpleNestedService.py

@@ -1,6 +1,6 @@
-from conjure import ConjureDecoder
-from conjure import ConjureEncoder
-from httpremoting import Service
+from conjure_python_client import ConjureDecoder
+from conjure_python_client import ConjureEncoder
+from conjure_python_client import Service
 
 class SimpleNestedService(Service):
 

conjure-python-core/src/test/resources/types/expected/package/nested_service/SimpleObject.py

@@ -1,5 +1,5 @@
-from conjure import ConjureBeanType
-from conjure import ConjureFieldDefinition
+from conjure_python_client import ConjureBeanType
+from conjure_python_client import ConjureFieldDefinition
 
 class SimpleObject(ConjureBeanType):
 

conjure-python-core/src/test/resources/types/expected/package/nested_service2/SimpleNestedService2.py

@@ -1,6 +1,6 @@
-from conjure import ConjureDecoder
-from conjure import ConjureEncoder
-from httpremoting import Service
+from conjure_python_client import ConjureDecoder
+from conjure_python_client import ConjureEncoder
+from conjure_python_client import Service
 
 class SimpleNestedService2(Service):
 

conjure-python-core/src/test/resources/types/expected/package/product/AliasAsMapKeyExample.py

@@ -6,9 +6,9 @@
 from .SafeLongAliasExample import SafeLongAliasExample
 from .StringAliasExample import StringAliasExample
 from .UuidAliasExample import UuidAliasExample
-from conjure import ConjureBeanType
-from conjure import ConjureFieldDefinition
-from conjure import DictType
+from conjure_python_client import ConjureBeanType
+from conjure_python_client import ConjureFieldDefinition
+from conjure_python_client import DictType
 from typing import Dict
 
 class AliasAsMapKeyExample(ConjureBeanType):

conjure-python-core/src/test/resources/types/expected/package/product/AnyExample.py

@@ -1,5 +1,5 @@
-from conjure import ConjureBeanType
-from conjure import ConjureFieldDefinition
+from conjure_python_client import ConjureBeanType
+from conjure_python_client import ConjureFieldDefinition
 from typing import Any
 
 class AnyExample(ConjureBeanType):

conjure-python-core/src/test/resources/types/expected/package/product/AnyMapExample.py

@@ -1,6 +1,6 @@
-from conjure import ConjureBeanType
-from conjure import ConjureFieldDefinition
-from conjure import DictType
+from conjure_python_client import ConjureBeanType
+from conjure_python_client import ConjureFieldDefinition
+from conjure_python_client import DictType
 from typing import Any
 from typing import Dict
 

conjure-python-core/src/test/resources/types/expected/package/product/BearerTokenExample.py

@@ -1,5 +1,5 @@
-from conjure import ConjureBeanType
-from conjure import ConjureFieldDefinition
+from conjure_python_client import ConjureBeanType
+from conjure_python_client import ConjureFieldDefinition
 
 class BearerTokenExample(ConjureBeanType):
 

conjure-python-core/src/test/resources/types/expected/package/product/BinaryAliasExample.py

@@ -1,4 +1,4 @@
-from conjure import BinaryType
+from conjure_python_client import BinaryType
 
 BinaryAliasExample = BinaryType()
 

conjure-python-core/src/test/resources/types/expected/package/product/BinaryExample.py

@@ -1,6 +1,6 @@
-from conjure import BinaryType
-from conjure import ConjureBeanType
-from conjure import ConjureFieldDefinition
+from conjure_python_client import BinaryType
+from conjure_python_client import ConjureBeanType
+from conjure_python_client import ConjureFieldDefinition
 
 class BinaryExample(ConjureBeanType):
 

conjure-python-core/src/test/resources/types/expected/package/product/BooleanExample.py

@@ -1,5 +1,5 @@
-from conjure import ConjureBeanType
-from conjure import ConjureFieldDefinition
+from conjure_python_client import ConjureBeanType
+from conjure_python_client import ConjureFieldDefinition
 
 class BooleanExample(ConjureBeanType):
 

conjure-python-core/src/test/resources/types/expected/package/product/CreateDatasetRequest.py

@@ -1,5 +1,5 @@
-from conjure import ConjureBeanType
-from conjure import ConjureFieldDefinition
+from conjure_python_client import ConjureBeanType
+from conjure_python_client import ConjureFieldDefinition
 
 class CreateDatasetRequest(ConjureBeanType):
 

conjure-python-core/src/test/resources/types/expected/package/product/DateTimeExample.py

@@ -1,5 +1,5 @@
-from conjure import ConjureBeanType
-from conjure import ConjureFieldDefinition
+from conjure_python_client import ConjureBeanType
+from conjure_python_client import ConjureFieldDefinition
 
 class DateTimeExample(ConjureBeanType):
 

conjure-python-core/src/test/resources/types/expected/package/product/DoubleExample.py

@@ -1,5 +1,5 @@
-from conjure import ConjureBeanType
-from conjure import ConjureFieldDefinition
+from conjure_python_client import ConjureBeanType
+from conjure_python_client import ConjureFieldDefinition
 
 class DoubleExample(ConjureBeanType):
 

conjure-python-core/src/test/resources/types/expected/package/product/EmptyObjectExample.py

@@ -1,5 +1,5 @@
-from conjure import ConjureBeanType
-from conjure import ConjureFieldDefinition
+from conjure_python_client import ConjureBeanType
+from conjure_python_client import ConjureFieldDefinition
 
 class EmptyObjectExample(ConjureBeanType):
 

conjure-python-core/src/test/resources/types/expected/package/product/EnumExample.py

@@ -1,4 +1,4 @@
-from conjure import ConjureEnumType
+from conjure_python_client import ConjureEnumType
 
 class EnumExample(ConjureEnumType):
     """This enumerates the numbers 1:2."""

conjure-python-core/src/test/resources/types/expected/package/product/EnumFieldExample.py

@@ -1,6 +1,6 @@
 from .EnumExample import EnumExample
-from conjure import ConjureBeanType
-from conjure import ConjureFieldDefinition
+from conjure_python_client import ConjureBeanType
+from conjure_python_client import ConjureFieldDefinition
 
 class EnumFieldExample(ConjureBeanType):